[06/11] crypto: Kconfig - allow tests to be disabled when manager is disabled

Origin: https://git.zx2c4.com/wireguard-linux/commit?id=357834af858e1a94b7f1a913b6678d2804996742
Bug-Debian: https://bugs.debian.org/953569

The library code uses CRYPTO_MANAGER_DISABLE_TESTS to conditionalize its
tests, but the library code can also exist without CRYPTO_MANAGER. That
means on minimal configs, the test code winds up being built with no way
to disable it.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[bwh: commit 2343d1529aff8b552589f622c23932035ed7a05d upstream]

Gbp-Pq: Topic features/all/wireguard
Gbp-Pq: Name 0006-crypto-Kconfig-allow-tests-to-be-disabled-when-manag.patch

diff --git a/crypto/Kconfig b/crypto/Kconfig
index cdb51d4272d0cc7c972fe0aa1db5a612af4cc89c..c24a47406f8f57b7550a98a20654fde836d212d0 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -136,8 +136,6 @@ config CRYPTO_USER
          Userspace configuration for cryptographic instantiations such as
          cbc(aes).
 
-if CRYPTO_MANAGER2
-
 config CRYPTO_MANAGER_DISABLE_TESTS
        bool "Disable run-time self tests"
        default y
@@ -155,8 +153,6 @@ config CRYPTO_MANAGER_EXTRA_TESTS
          This is intended for developer use only, as these tests take much
          longer to run than the normal self tests.
 
-endif  # if CRYPTO_MANAGER2
-
 config CRYPTO_GF128MUL
        tristate